Merge master into b1

Merge master into b1