Merge branch 'topic/core' into for-linus