4.3 updates
Merge pull request #4385 from GrahamCampbell/4.3-new

[4.3] Updates - Followup To #4379