KAZOO-2839: updates to match upstream changes