Merge "Clean up old flag from tests" into main