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