Merge branch 'for-5.6-fixes' into for-5.7