CMS-4432 Improve generic command input converter.
CMS-4432 Improve generic command input converter.