Merge "b10.1" changes