Fixes #5299
Merge pull request #5321 from mwerezak/diona-lang

Fixes #5299