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