[COMMIT] Sync riece with upstream version 1.0.8