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