Merge "Fix bug in policy size tracking" into main