[3.8] Fix #1338 reorder collections don't work