merge - 7a3f3ad83676  Fixes Issue #12044.
4 files changed