Fix 3.8.4a2 migration patch
Merge pull request #1073 from nlegoff/fix-migration-384a2

[3.8] Fix migration 3.8.4-alpha2