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