Thank you Tony. A local engineer, Terry, diagnosed and replaced the pump and diverter. He has been repairing my boiler for the last 15 years. BTW, I believe he used to work for Vaillant. However, when I reported that the boiler keep cutting-off, Terry asked me to look for another engineer and...