[sr-dev] git:master:40ecbb12: Merge pull request #2442 from dwagin/master