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