Merge pull request #12292 from cpuguy83/remove_commands_integration

Remove commands integration