Merge branch '8u152_1'