[4.3] Updates - Followup To #4379

Followup to #4379.