Merge branch 'devel/new_mesh' into devel/master