Merge pull request #6 from alsorokin/CB-12622