replace StringBuffer with StringBuilder
Merge remote-tracking branch 'origin/4.3' into 4.3