Conform to M4 change
Depend on pub dart-xml
Merge