[sr-dev] git:master:6728fa97: Merge pull request #2256 from gdt/master