Merge pull request #3265 from najdanovicivan/patch-2