[hibernate-dev] Which branch to target?

After a significant hiatus, I have restarted my work on adding improved support for Firebird 2.5 and 3.0 (and more importantly struggling through some test failures). I am wondering what I should target for my changes: the current master branch or the upstream/wip/6.0 branch. What would be the preferred or 'better' option? Mark -- Mark Rotteveel