Xipong
# PR #92488 / #76370 salvage