BLOCKERS: #40630, #40752 and #40756.