Fix some style bugs related to merge from 2-0-stable
Fix some style bugs related to merge from 2-0-stable