replace with relative URL
merge from master