yuanchenglu # PR #47026 salvage