fixup! Add combined
fixup! Add common
docs: rearrange the options documentation