[sr-dev] git:master:cb7008a9: Merge pull request #1741 from ycaner06/patch-12