Backport #33215 Manually resolved "reqctx" conflict --------- Co-authored-by: Chai-Shi <changchaishi@gmail.com>