Merge changes I17acf67f,If2410a4d into devel/master