Merge branch 'split-options-config'