Merge "Introduce SizeMatcher" into main