WIP: PKCS#11 rollup patch