Commit from Publish-PKI by user vladv on NIKITA