Degrade bubbles to boxes
Hack for tagging bubbles
Merge branch 'feature/mobile-bubbles' into develop
Merge branch 'release/1.6.0'