Sweeping !37158 from 21.3 to 21.9. Manual sweep of second part of !36845 (Modifications to support combined NSW&BIS78 layouts)
Manual sweep of second part of !36845 (merged) (Modifications to support combined NSW&BIS78 layouts)
See merge request !37158 (merged)