Merge branch 'topic/hda' into for-4.2