Merge "Remove base divergence" into main