Merge branch 'topic/hda' into to-push