[sr-dev] git:master:9084ef85: Merge pull request #981 from ycaner06/patch-9