Merge changes I000b9684,I1a6a0f46 into devel/master