Merge branch 'topic/via-cleanup' into topic/hda