[4.3]cherry-pick d38a50343130f6f147e2c9c7b2e32a43f31c7e6b

[Daan Hoogland]

Animesh,

Can you cherry pick d38a50343130f6f147e2c9c7b2e32a43f31c7e6b from 4.3-forward 
to 4.3?

thanks,
Daan