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

I could not come up with an automatic way to get good commit comments, although they will still be in the other branch.

The thing to watch to out for is mainly the tests, since some got Ignored, even though they do not include any direct reference to new classes. I tried to keep those changes out.