[sr-dev] git:master:ae0797ee: Merge pull request #1796 from que273/master