Merge changes I150e1a74,Ie6d24150,I91081f5a into devel/master