Resolved Issue #2898
Merge branch 'hotfix/4061'

Close #4061
Merge pull request #4063 from Spalax/ZF2-Issue#2898

Resolved Issue #2898
Merge branch 'hotfix/4063' into develop

Forward port #4063