Merge pull request #3832 from microMolvi/patch-2