Fixes #12774
Merge pull request #12776 from gtmanfred/develop

Fixes #12774