KAZOO-3116 initial