Merge changes I88ded17f,I3960a370 into devel/master