Develop into graphpolaris

Geurtjens,D. (Douwe Geurtjens)requested to merge
GravenvanPolaris/query-service:develop into develop

Vintage big merge

Merge request reports