Port #11488 patch from 3.1 (changeset f816841bab03)
2 files changed