Merge branch 'hfi1-2' into k.o/for-4.7