Merge pull request #230 from Bug 1086698-issuer (backport)