Merge pull request #5550 from Cry-Miron/patch-1