[3.8] Fix #1677 : Avoid migration failure