**_Reported by Gajinder Vij:_** Behavioral changes as well as improvements need to be applied to existing Management commands. (Imported from Jira ZEP-891)