Teiiddes 2247

All three of these commits would need to be backported to 8.3.4 for this functionality to be properly implemented.