Fix command bug.
Merge remote-tracking branch 'framework/4.0' into 4.0