fix comments about CommandArguments and replace with Arguments
Merge branch 'develop'. Relese os-1314b