possible fix for command rose resolution #857
Merge remote-tracking branch 'upstream/master'