Feature markers

I wanted to wait for some PR being passed to ship it with tests, nevermind ...