Fix typos
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/master