Merge branch 'sg/help-autocorrect-config-fix'