Merge "Intersect buffer crop with buffer size" into main