Merge branch 'topic/core-change' into for-linus