Merge changes I6d6c0232,I6667d1d6,I43e227fc into devel/master