is_enabled mandates only
Merge branch 'master' into WMFR