Merged with latest FellowTraveler fork