etib-branch-hotfix-double-header Gatekeeper