Merge "Revert^2 "Add exemptions to flex policy."" into main