Merge branch 'Frontend-Merge' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into Frontend-Merge