I tried the later proposition and it didn’t work.
But I’ve to say, it’s quite complicated and it’s possible I made one or more mistake by copying. Than I had to copy back my saved files (don’t forget to do it before trying this solution).
Does someone else made a better experience than mine?