Merge for backport  of fix for issue #25930