KAZOO-799: backport