Merge branch 'for-4.9/core' into for-next