Fix conflicts between SOA Track MR !2920 (merged). Run concurrent with Rec!2408 (merged) and Phys!925 (closed).