Merge "Fix GCA crop" into main