merge split brain and link pull fixes from 6.0