Merge changes Iad693ca2,Iee884a85 into devel/master