Merge branch 'develop-v2' into chore/remove-postman-email-flag #366

Job	Run time
Deploy / Build and push image to ECR	3m 29s
Deploy / deploy	17s
	3m 46s

Provide feedback