KAZOO-2881: Update for pull request