KAZOO-731: Cherry pick accepted commits from pull request #10