Cosign 3.3.0 branch

Bring the cosign 3.3.0 updates into the userfactor branch