Merge branch 'features/JAL-1641_JSON_' into develop