Merge branch 'b1-2' into b1