It should be. I haven’t looked at the 4.6 to 4.7 changes yet. If the rendering pipeline changed significantly, it might require some effort to update the various branches, but once that is done, it should combine into a single branch fairly easily. I hope.