Merge branch 'swanctl-pkcs12'