Fix IDs order change for folder items when doing drag & drop
Merge remote-tracking branch 'origin/master' into release-3.3.0