I think we need to cherry pick the eager fetch PR, my 2.13.x PR is failing checks