[3.8] Fix #1544 : Upgrade data command fails