CS-4908
Merge pull request #685 from terwey/patch-5

CS-4908