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