temp duplicates
temp trait
Merge branch 'stable' of https://github.com/Thalassicus/cep-bnw into stable