Merge changes Ibfc625f5,I26bd5ff5,I255b92f4,I0eff1efe,Id7827d1b, ... into devel/master