Clockfix patch rebased on r9280