Fix spelling mistake
Merge commit 'ebf113ac85758855b08c1c7c022f0a301d100b79' into next_release