Merge branch 'for-3.14-fixes' into for-3.15