Merge "Resource dictionary: backend URL changes"