[sr-dev] git:master:60cf4502: Merge pull request #2566 from sergey-safarov/master