[sr-dev] git:master:8351df3d: Merge pull request #1967 from alishir/master