Merge changes I91aadcd7,I6bad1977 into devel/master