Fixes: #16528 Co-Authored-By: Michael Wake <macwake@gmail.com>
The refactoring exposed that the original implementation was referring to an undefined variable src_name, which was previously only used in error messages. This has been fixed as part of the refactoring work. Fixes: #20336