change CommandEdit and its helper text
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch