Merge branch 'features/JAL-1739_JSON-versioning' into develop