Add a configuration option to disable autocorrect
Resolving conflict in #1266 merge