[sr-dev] git:master:ae828e8c: Merge pull request #2375 from sergey-safarov/dipatcher-frmating