Merge changes Icc3e3c9f,I2e268700,I89760410,Ibcf4f854 into devel/master