Merge second fix for issue #11149.