BC-1429 #comment fixed for command.
Merge remote-tracking branch 'origin/2.0.x'