KAZOO-576 changes