setting b1
setting b1.2
Merge branch 'b1'