[sr-dev] git:master:4ce701bd: Merge pull request #1630 from sergey-safarov/master