More vulns fixes #711

Job	Run time
build-deploy-dev	11m 2s
Cypress Functional Tests (post-deploy) - executes on a freshly deployed dev API.	10m 5s
	21m 7s

Provide feedback