Fix some features handling (#1045)

7 jobs for master in 29 minutes and 35 seconds (queued for 1 second)