Merging branch restructuring_bridges into trunk
Authored by: lonfield 2023-03-26
Parent: [r374]
Child: [r376]