Merge branch feature/updateJSONSchema with refs/heads/master into refs/merge-requests/22/train

1 job for !22 with feature/updateJSONSchema into master in 3 minutes (queued for 3 seconds)
merge train