Implemented ticket #536
"Refactor code for old commands"
Authored by: numere 2020-10-31
Parent: [r780]
Child: [r782]