Merge branch 'dev-sonata-dummy-gatekeeper'