KAZOO-2749: Fix for pull request
KAZOO-2749: Use cb_context