r23909 already merged
r24184 will not occurs at zf2