#1116 "Finalize choice of new component/repeat separators"