Merge branch 'topic/hda-cleanup' into for-next