[sr-dev] git:master:20eb9951: Merge pull request #1555 from sergey-safarov/my-master