xml update for v5 merge