At last our Wave has been reverted back to software version 20.18.00. Looks like it has fixed the issues. Tonight room set to 21 degrees flame stayed on until set temp, pump ran on for approx 10 minutes and has been off ever since. Room temp has dropped to 20.8 will be interesting to see when the boiler fires up again.