Merge changes I34a6851c,I046e6272,I169f6b40,Iec24bf37,I89933b0c