Merge branch 'b44'