merge with big refactor change #3655

Job	Run time
Integration Tests (Java 11) (mongodb)	1h 36m 35s
Integration Tests (Java 11) (hsqldb)	1h 20m 47s
Integration Tests (Java 11) (monetdb)	1h 36m 49s
Integration Tests (Java 11) (postgresql)	1h 5m 22s
Integration Tests (Java 11) (file)	1h 36m 37s
Integration Tests (Java 11) (cottontail)	1h 36m 33s
Integration Tests (Java 11) (neo4j)	1h 36m 22s
	10h 29m 5s

Provide feedback