Merge #15054 with fixes

Just a copy edit and single quotes