Typo fix
(cherry picked from commit 557f7e2)
Merge remote-tracking branch 'origin/prod' into prod