Update bypass branch

This merges the latest changes from O4-dev. There weren't many conflicts, but I'm still waiting on tests.

Most conflicts related to new command line arguments.