Fix for moving folders up & down screws up compilation since ids are changed (same problem as in a previous fix for folders dragging).
Merge remote-tracking branch 'origin/release-3.3.0'