Merge branch 'development' into json-fix-extended