Source API name/ID cleaning issue #354
Merge pull request #423 from asobolev/master

Source API name/ID cleaning issue #354