XDR handling separated from withCredentials, introduced peer review changes