#3613795: Added the bypass method; a bit of cleanup.

Closes #3613795

Merge request reports

Loading