Merge branch 'topic/hda' into topic/hda-switcheroo