Merge branch 'jk/options-cleanup'