Merge "Add behaviour for 2D / 3D layers." into devel/new_mesh