[3.8] Fix #1544 : Upgrade data from 3.5 does not work