[sr-dev] git:master:5966b55b: Merge pull request #2270 from goharahmed/master