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