Merge branch 'topic/ste' into for-linus