Forward of ZF-12421

https://github.com/zendframework/zf1/commit/16fecf1fda4c9fd28f0558fd5b1ab6f34cd2a36f