Merge branch 'for-4.6-fixes' into for-4.7