Merging 2nd fix for #254670