merge timingfixes