ZF-10149: Applying the rest of the patch from Richard Tuin
ZF-10149: Applying the rest of the patch from Richard Tuin

svenax/ZendFramework,svenax/ZendFramework,svenax/ZendFramework,svenax/ZendFramework,svenax/ZendFramework