I am not sure the future of bellatrix, but i will try to backport the fixes if those are relevants for aros.