Pull in some changes from the security fork
What does this MR do?
Pull in some changes from the security fork.
These changes are currently in the security fork, but could as well live in canonical.
Why was this MR needed?
To make it easier to keep the security fork in sync / resync it.
What's the best way to test this MR?
-