Fixes #7068
Merge pull request #7087 from mwerezak/master

Fixes #7086