Merge branch 'for-4.15-fixes' into for-4.16