[sr-dev] git:master: Merge branch 'lazedo/kazoo'