I've merged it into git master. Regarding chery picking into stable branch, as far as I understood it, it seems to work generally, just without caching the certificates. So its seems to be not a bug fix, but a feature extension, and these are not introduced into stable branches.