Merge changes I776588c1,I7292a2fb into devel/master