DNN-5648 / SOCIAL-3344 Upgrade fails