Complete merge.

Reorder bypass functions to match postcoh.
3 jobs for !38 with ldavis/bypass in 2 minutes and 34 seconds
merge request