Split of #834 into 24 parallel-friendly sub-issues across 6 batches (audit-b1..b6). Tracking issue: #834.