[sr-dev] git:master:d594ff8d: Merge pull request #2393 from tao-communications/master