Merge branch 'hfi1' into merge-test