Followup r82810, r82813, r82814