[sr-dev] git:master:d189be29: Merge pull request #2662 from fgaisnon/master