Merge "Add 'origin' parameter to flag declarations" into main