Part 2 of Card 536
Merge pull request #1916 from lnader/536

Part 2 of Card 536