Merge changes I48753b8f,If7ef493d into devel/master