Update parameters
Fix or/|| issue
Add URL signatures. Merge upstream.