Merge changes I90752dc1,If040eaa9,I50559f33 into devel/master