Merge #9124: Use better name for local variable to prevent -Wshadow compiler warning