Merge branch 'hpet' into release