The fork resolution logic I talk about in this post will fix this issue; lack of fork resolution in hivemind is the ultimate reason we have the delay. But this will be a challenging task technically, so I guess it will take a few months to complete.