Merge pull request #2831 from elieyal/patch-3