Fixed now for 8.6 / trunk (within merge to new clock-engine, see *-clock-speedup branches).
If someone need the fix for 8.5, please contact me.