Merge branch 'man-pki'