Merge "Improve multi-crop forward compatibility logic" into main