Implements CS-4972
Merge pull request #553 from terwey/CS-4972

Implements CS-4972