Backport/gh 7427

Checklist

• make -j4 test (UNIX), or vcbuild test nosign (Windows) passes
• tests and/or benchmarks are included
• documentation is changed or added
• commit message follows commit guidelines

Affected core subsystem(s)

deps

Description of change

Backport of two commits from the master branch.

cc @TheAlphaNerd