Patch show-stopping security vulnerabilities

Duplicate of #1944 for `master` (1944 patched `v1-stable`).