Merge ruih/master into cbl_master/plugfest36. 

Merge ruih/master into cbl_master/plugfest36.