forgot a bit when enabled the quadratic delay
Merge branch 'master' into portable