KAZOO-1200: fix box
Merge branch 'KAZOO-1200'