Serious issue with Database upgrade (failed from 3.2.1.3 to 3.3.0.2)

This problem is documented at #6710 and there’s a suggested fix there.

This problem is being discussed at #6703 and an answer should be available there soon.