BLOCKERS: #40630 and #40752.