Merge branch 'master' into secure/5.15.0-r7 #7

Job	Run time
Setting variables for docker build	4s
Build security Docker image / Build and export to AWS ECR	2m 1s
	2m 5s

Provide feedback