     // Handle poll/cmd message (at relay).
     // IFF this message is addressed to this (target) unit's house code
     // then action the commands and respond (quickly) with a poll response.
-    case OTRadioLink::FTp2_CC1PollAndCmd:
+#if !defined(ENABLE_OTSECUREFRAME_ENCODING_SUPPORT)
+    case OTRadioLink::FTp2_CC1PollAndCmd: // Non-secure.
+#else
+    case 0x80 | OTRadioLink::FTp2_CC1PollAndCmd: // Secure.
+#endif // !defined(ENABLE_OTSECUREFRAME_ENCODING_SUPPORT)
       {
       OTProtocolCC::CC1PollAndCommand c;
-      c.OTProtocolCC::CC1PollAndCommand::decodeSimple(msg, msglen);
+      c.OTProtocolCC::CC1PollAndCommand::decodeSimple(cleartextBody, cleartextBodyLen);
       // After decode instance should be valid and with correct house code.
       if(c.isValid())
         {

#endif
    return; // FAIL
    }
#endif // ENABLE_OTSECUREFRAME_ENCODING_SUPPORT

  const uint8_t firstByte = msg[0];

#ifdef ALLOW_CC1_SUPPORT_HUB
    // Handle poll-response message (at hub).
    // Dump onto serial to be seen by the attached host.
#if !defined(ENABLE_OTSECUREFRAME_ENCODING_SUPPORT)
    case OTRadioLink::FTp2_CC1PollResponse: // Non-secure.
#else
    case 0x80 | OTRadioLink::FTp2_CC1PollResponse: // Secure.
#endif // !defined(ENABLE_OTSECUREFRAME_ENCODING_SUPPORT)
      {
      OTProtocolCC::CC1PollResponse a;
      a.OTProtocolCC::CC1PollResponse::decodeSimple(cleartextBody, cleartextBodyLen);
      // After decode instance should be valid and with correct (source) house code.
      if(a.isValid())
        {
