Merge branch 'feature/22-remove-query-management' into dev