Merge changes I4fa379a3,I0c63e69a