[sr-dev] git:master:eb8049fe: Merge pull request #2550 from amessina/master