Reproduce text changes from @brson PR 7176 and fix a typo therein