DNA2 fixes cherrypicked from N3X15.