Fix enable/ensure nonsense
Merge branch 'master' into next