Merge changes I9b0e0ea4,If3b41a80