KAZOO-1513: prepare for merge