Merged fix for issue #18260 from 3.3