merge in tahoe support