Merge changes I6716197b,I07fe2d5a,Ia35a6007,I1457c89a,Iaaf3b308 into eel