Merge changes I1b1abc2c,I47083821,Icbe72d36,I6292beb0,I14b750ac, ... into devel/master