Merge branch 'feature-branch' into develop #192

Job	Run time
Unit Tests	28s
Integration Tests	2m 45s
Build and Start Using docker-compose	1m 11s
	4m 24s

Provide feedback