mgmt_system.py polishing
Merge pull request #658 from mfalesni/mgmt_system_polishing

mgmt_system.py polishing