KAZOO-3081 updates after review