[sr-dev] git:master:a5cc190c: Merge pull request #2134 from mbodbg/master