Fixes #10016 and updates that rather badly formatted callout
Merge remote branch 'upstream/master'
Not sure why I am so out of sync with master here