Unified command handling #1041, #1042