Apply xTuple patches for #2096355 #2104341 #2096361.