issue #24559 - backport to 4.6.1

backport fix and bump version for web-only release