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