Merge changes I4a9861ed,I61c130b9