Merge branch 'feature/access-policy' into 'master'

Feature: access policy for proxy.conf

See merge request !6