KAZOO-1863 changes suggested
Merge branch 'KAZOO-1863' into KAZOO-2105
Merge branch 'KAZOO-2105' into KAZOO-2106