update for 7.x-1.3 and add XML datastream handler