All the diffs from the FDB branches that aren't about adding FDB support specifically.