KAZOO-1733: backport pull request