[Pki-devel] [PATCH] 0038..0041 fix upgrade issues