Merge pull request #1833 from ysoyipek/patch-3