Merge pull request #2148 from ysoyipek/patch-5