Fixes #7209
Merge pull request #7210 from Zuhayr/dev

Fixes #7209