Merge branch 'develop'
Dramatic performance improvement on response javascript
Merge branch 'hotfix/1.2.2' into develop