Merge branch 'master' into fix/fix_conflicts #66

Job	Run time
Tests (0-2)	9m 19s
Test build docker image	13m 36s
Lint code	4m 49s
System tests (0-4)	11m 30s
System tests (1-4)	9m 20s
Tests (1-2)	9m 2s
System tests (2-4)	9m 23s
TODO	7s
System tests (3-4)	9m 53s
Build and push image to Registry	0s
Generate release	0s
	1h 16m 59s

Provide feedback