Merge "Fix size of Rect fields in CROP spec" into main