Merge changes I0e507c05,Ib114c29b into devel/master