Merge changes I5f84fd91,I34ea53e7