Merge "Fix occasional fusion divergence by detecting it and resetting the fusion."