     // 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())
         {

#ifdef ALLOW_CC1_SUPPORT_HUB
    // Handle poll-response message (at hub).
    // Dump onto serial to be seen by the attached host.
    case OTRadioLink::FTp2_CC1PollResponse:
      {
      OTProtocolCC::CC1PollResponse a;
      a.OTProtocolCC::CC1PollResponse::decodeSimple(msg, msglen);
      // After decode instance should be valid and with correct (source) house code.
      if(a.isValid())
        {

            { OTV0P2BASE::serialPrintlnAndFlush(F("!TX key")); return(false); } // FAIL
          const OTRadioLink::SimpleSecureFrame32or0BodyTXBase::fixed32BTextSize12BNonce16BTagSimpleEnc_ptr_t e = OTAESGCM::fixed32BTextSize12BNonce16BTagSimpleEnc_DEFAULT_STATELESS;
          uint8_t buf[OTRadioLink::SecurableFrameHeader::maxSmallFrameSize];
          const uint8_t sbodylen = secureTXState.generateSecureOStyleFrameForTX(buf, sizeof(buf), OTRadioLink::FTS_RESERVED_Q, lenTXID, txbuf, bodylen, e, NULL, key);
          const bool success = (0 != sbodylen) && PrimaryRadio.sendRaw(buf+1, bodylen-1);
#if 1 && defined(DEBUG)
          if(!success) { OTV0P2BASE::serialPrintlnAndFlush(F("!TX Q")); }
          else { OTV0P2BASE::serialPrintlnAndFlush(F("TX Q")); }
#endif
          if(success) { return(true); }
#endif // !defined(ENABLE_OTSECUREFRAME_ENCODING_SUPPORT) 
          // Fall-through is failure...
          OTV0P2BASE::serialPrintlnAndFlush(F("!TX fail"));
