Merge changes I8290457c,If84199a1