Change standard enable handling - if not disabled, enable
Merge branch 'devel'