Merge changes I02677edb,If59805d2 into devel/master