Reading ESH #5762, it seems to me like there is still some debate to come for the ‘final’ solution. But the use of the CT-mode parameter as proposed by @Kai is a nice and simple fix.
Anxiously waiting for the next ESH build to be included in OH… ;o)
