v3.9 - Policy updates
Merge branch 'policies' of https://github.com/Thalassicus/cep-bnw into policies