Merge "Satisfy code analyzer by ensuring $urls is defined"