[Pki-devel] [PATCH] 109 Fixes for tickets 1155, 1156