Merge "Fix ESR url"