Merge changes Ib6cb5b6c,I024732cd,Ic7bd0439 into devel/master