Merge pull request #2704 from dhrupadb/patch-1