Merge changes I9d2b148e,Iccf6ea81