Merge branch 'for-4.9' into for-4.10