Merge pull request #2741 from shaavan/issue-2215