Implements CS-5080
Merge pull request #571 from terwey/CS-5080

Implements CS-5080