Merge changes I7234d85c,I6a771210 into devel/master