RED-2112
Merge pull request #27 from bozba/patch-22

RED-2112