2.4 upgrade typos + formatting
Merge remote-tracking branch 'origin/pr/1621' into develop