Merge changes I83c26470,I6fe45a0f into devel/master