Merge changes I20578f97,I629c909b,I54f04c99,I9c1e3a28,Ie681c8c5