KAZOO-545: wrap-up