Merge "Fix true divergence mode"