[Finishes #83937942]
Merge pull request #38 from Nurego/michael-dev-hotfix

[Finishes #83937942]