Addresses bug 943006 review
Merge pull request #999 from yurydelendik/review-943006

Addresses bug 943006 review