KAZOO-2561 changes for pull request