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