sync with 3.0.0 tag