[sr-dev] git:master:2cab97ec: Merge pull request #1081 from sergey-vb/topos-fix-02