Merge branch 'develop'
requires explicitly sorted/neater json
Merge branch 'hotfix/1.0.1' into develop