Merge spelling correction from trunk
Authored by: david_costanzo 2020-06-08
Parent: [r5276]
Child: [r5278]