[Pki-devel] [PATCH] 52-2 Fixes for review comments for patch 52