[sr-dev] git:master:e404e1a6: Merge pull request #578 from sipidronov/dispatcher-avl