Merge changes I61f10917,Id5b9872e