Merge branch 'topic/next' into for-next