Fixed style error.
Merge remote-tracking branch 'origin/next' into cli