Merge branch 'topic/hda-stac-fix' into topic/hda