KAZOO-3216
Merge pull request #689 from onnet/KAZOO-3216

KAZOO-3216