Merge "Rework remote command arguments"