Re #1335 Applying URLBuilder changes.