Merge changes I7066e6c1,I3f0c228e into devel/master