Implements CS-4798
Merge pull request #395 from terwey/CS-4798

Implements CS-4798