Fix a log message
Merge branch 'public/7.7' into public/7.8
Get some more debug output to better understand build issues for 7.8