Updates #2534: ensure all options are linked even if linked manually