Merge branch 'topic/virtuoso-fix' into for-linus