t660 fix hardcoded url issue
Merge branch 't660' into po_ready