Merge "Unify flag for multi-crop (2/3)" into main