While I was driving today, the Charging System Fault warning came up. I checked the voltage with the engine off and with the engine running running and the readings would seem to suggest that the alternator and battery are both good.

Voltage when running - 13.6v
Voltage with engine off -12.5v

Would a failing Start-Stop battery also cause the Battery Charge Fault?

I will call my local specialist, who does free diagnostics on Monday, although it's a pain as I was hoping to use it tomorrow.