[sr-dev] git:master:11ff4226: dispatcher: use xavps instead of avps