Merge "Add config option to add extra cfg flags." into main