Merge pull request #5159 from MaurGi/patch-1