Merge changes I5d11a642,I4ed191bd