Merge changes I1eb87265,I98fa1da7 into devel/master