Fix #1659 reorder feature is broken for baskets & stories
Merge pull request #884 from nlegoff/fix-1659

[3.8] Fix #1659 reorder feature is broken for baskets & stories
Merge branch '3.8'