Merge "Fix in InjectKeysFromURI"