Port to dart m4 release