Fix typos
Merge commit 'a84f5718903678bfa7735635b3bcd14f87b8412f' into develop