Merge "Expose flags for tests" into main