[sr-dev] git:master:1e71e135: Merge pull request #2666 from mojtabaesfandiari/master