Strangely, without any input from myself or Tech Support, this sorted itself out after about 30 minutes. I have no idea what was going on!
However, the upgrade has "broken" my AWS S3 settings and none of the photos are displaying so I'm back to waiting for Tech Support 🙂