Merge branch 'topic/fix/hda' into topic/hda