Merge fix of formatURL from 3.0