Merge branch 'master' into feat/al2_old_dockerfile #568

Job	Run time
Python Unit Test with Postgres / run_tests	4m 12s
Security Pipeline / secrets-detection	10s
Build Image and Push Mcrypt Image / Build Image and Push	3m 26s
Build Image and Push / Build Image and Push	1m 57s
	9m 45s

Provide feedback