Merge "Don't add extra_cfg twice." into main