Fixed typos
Merge branch '2.2' into 2.3
[#3076] Changes for 2.3 only thanks to @pborreli
Merge branch '2.3'