[uk] fix typos
Merge branch 'backport-uk-2-3' into 2-3-stable