merge

new configuration style for "enabled" flag