Merge eep_integration so that I can work on main again
This branch has been far too long lived for development, pull the changes into main and use it as the main branch once again.
This branch has been far too long lived for development, pull the changes into main and use it as the main branch once again.