Merge changes I89471ca9,I866ffdec into devel/master