Change enable -> ensure
Merge branch 'master' into next