Merge changes Icb27671f,I07e96827,I9d70a98c,Idb7ef27c into devel/master