Merge changes I555b7cf0,I1be28edf,I605de844,I87caee64 into devel/master