Merge branch 'topic/hda' into next/hda