Merge branch 'develop-v2' into chore/vault/throw-errors #332

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

Provide feedback