Merge pull request #10301 from opsmill/ds-backport-hex-branch-names-stable