Merge changes I7fd36a6d,I2c2e4fe7 into devel/new_mesh