Fix typo
Merge branch 'public/7.8' into public/7.9