backport all security configuration from master because the branch has been created before
10 files changed