Some style changes
Merge remote-tracking branch 'origin/release/2.0' into release/2.0
biicode confi