Security manual merge

https://github.com/olga-jane/prizm/pull/481