[sr-dev] git:master:7563a52e: Merge pull request #2544 from lbalaceanu/master