KAZOO-2847: Pull request changes