Merge "Adjust SF owners" into main