Merge changes I3b2a87cd,If344b5e0