Merge OCTC changes to command framework and add @RequiredSenderType