[PATCH conductor 0/1] #858997 - Fix XHR errors