Merge changes I8290457c,Ic2111f4f into stable/hydrogen