Merge "Replace array for collection" into main