[sr-dev] git:master: core: Enable xavp's by default