NG-16582 Add option of passing buildUrl back