KAZOO-2780: backport