global 6.2.10, --HEAD

Closes #25944.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
global: use build.with?
Merge remote-tracking branch 'upstream/master'