Merge changes I1aa1107c,Iede00fcd,I43ba1a81 into devel/master