- merge some patches & re-enable timings