Merged in the g2r-basis-filename.diff changes so that the receiver