Merged 3.0.8 version