Merge "Add flag override to fix test failure" into main