Implement workaround for regression - Fix Issue 11053.
Merge pull request #1580 from AndrejMitrovic/WorkAround1561

Implement workaround for regression - Fix Issue 11053.