Merge pull request #378 from ds-wizard/hotfix/4.28.4

Merge pull request #378 from ds-wizard/hotfix/4.28.4 #886