r24702 is merged with https://github.com/zendframework/zf2/pull/4431
r24807 is merged with https://github.com/zendframework/zf2/pull/4470