Merge "Fix T-junctions in layers' generated meshes" into jb-mr2-dev