Fix b1.1
Merge branch 'b1' into b1.1