Fix management commands
fixup! Fix management commands
Merge pull request #3810 from cpennington/ok-management-commands

Fix management commands