Merge branch 'features/JAL-1641_JSON-extension' into develop