Review Large Diff Triage

Split a very large change into reviewable groups and review the riskiest group first.

• split
• code