123456hyu
# PR #122936 salvage base (salvaged from #122290; commits carried verbatim)