some more testing on custom features
Merge branch '373-test-custom-features' into sprint5