updated to upstream v3.0.3