Merge "Revert^2 "Remove base divergence"" into main