Kazoo 806

please merge KAZOO-2674 first. don't know if pull request will be automatically updated. if not, close and issue new pull from KAZOO-806