Merge branch 'refs/heads/t/command_handler_cleanups'