Improve perfomance on zooming
Support group in content
Merge branch 'develop'