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