Hi @555 and also @Pigmaster ,
I found the line of code causing the issue. I took the liberty of installing a version with this line reverted on both your systems, and you should see that it is now working correctly. This has however also unfixed a bug that prevents you from overriding peak shaving with a very large setpoint, so just don’t do that for now.
Thanks for reporting, I know where to look now.