Merge "Fix grid migration item copy bug" into main