Merge branch 'fix/hda' into topic/hda