Merge branch 'topic/st' into for-linus