Merge branch 'develop' into fix-shadowserver-fixed-report-type #172

Job	Run time
Run unit tests with pytest (3.7, full)	5m 3s
Run unit tests with pytest (3.7, basic)	1m 45s
Run unit tests with pytest (3.8, full)	5m 9s
Run unit tests with pytest (3.8, basic)	1m 45s
Run unit tests with pytest (3.9, full)	5m 39s
Run unit tests with pytest (3.9, basic)	1m 55s
Run unit tests with pytest (3.10, full)	5m 5s
Run unit tests with pytest (3.10, basic)	1m 50s
Run unit tests with pytest (3.11, full)	4m 55s
Run unit tests with pytest (3.11, basic)	1m 39s
	34m 45s

Provide feedback