Merge changes I75f2d974,Ib8d53cf7 into devel/master