Follow-up r78865 CR