[sr-dev] git:master:f3d58f77: Merge pull request #2621 from dvillaume/master