Merge branch 'revert-e756f2a2' into 'master'

Revert "Merge branch 'ad-app-feature-flag' into 'master'"

See merge request !455
6 jobs for master