Merge branch 'topic/core-fixes' into for-next