Merge branch 'topic/virtuoso' into for-linus