Part 1 of Card 536
Merge pull request #1892 from lnader/master

Part 1 of Card 536