Merge changes Ib67a4593,Iecf1c85f into stable-3.2