Issue 1950
Merge pull request #2264 from krbvroc1/issue_1950

Issue 1950