[sr-dev] git:master:a37f3fe8: Merge pull request #2083 from amessina/master