Merge branch feature/json_adapter_stripped_objects with refs/heads/master into...

Merge branch feature/json_adapter_stripped_objects with refs/heads/master into refs/merge-requests/61/train
2 jobs for !61 with feature/json_adapter_stripped_objects into master in 44 seconds (queued for 3 seconds)
merge train