Merge "Fix ArrayIndexOutOfBoundsException after allowing reorder" into main