merge fixes, up to 8.0.0 now