Merge branch 'for-7.0-fixes' into test-merge-for-7.0-rc3-fixes