added ability to enable PKI sigining
fixed merge conflicts