KAZOO-2635: continued updates