Merged to v3.0.1