[sr-dev] git:master:6c1c957b: Merge pull request #2584 from sergey-safarov/master