PRs that allow master to match v3 cases BFB out of the box ((except for nonlinear maps) and additional PRs for changes we want in v3.0.0.