KAZOO-2092 done