*8664* Prepare core to handle with URL override case