Merge branch 'features/JAL-1641_JSON-tests-and-docs' into develop