Implements CS-5196
Merge pull request #584 from terwey/CS-5196

Implements CS-5196