etib-branch-fix-client-feedback-june-16 Gatekeeper