Merge "Revert "Correctly compute the minimum crop size"" into main