Merge changes I7b63ee17,I61bd1ed2 into devel/master