Comment 20 for bug 1422379

A major piece of this work has now been incorporated as bug 1748924. This branch must now be reworked to take advantage of these new structures, which will ultimately be less disruptive than the original intent to replace them.

I would not advise using the branch posted here in production unless you understand the steps which will be necessary to eventually adjust your data to conform to 3.1+ expectations.