Merge pull request #18471 from liudf0716/xfrpc