just avoid any 'jumping' branches ! so I think it's better to make a vox8 branch now and cherry-pick/backport needed changes from main. Like this is also clear, that openvox8 is in maintenance or sort of feature complete.