Merge "update oof hostname in the url"