Merge remote-tracking branch 'origin/public/7.7' into public/10.0