Merge of post preliminary design changes into main

Main modifications include

• Updated data for Lyra and Orion
• Minor quality of life improvements

This merge is intended to setup a clean tree for the definitive data that will be available before the critical design review of december