[3.8] Fix #1607 Reoder collections is not working