Merge branch 'topic/hda' into fix/hda