Merge "Enforce max size limits for policies" into main