Clockfix patch rebased on r9325.