Backport of Cross Section machinery fixes to 72x

Backport of fixes/finalization of cross section machinery that are already in 73x and 71x.