[COMMIT] Sync riece with upstream version 2.0.2