Merge changes Ifb01e9f1,I405a2317,Ifbaf2447,Ief534eaa,I0716ed83 into 0.16.x