Ticket 4117

Based on my branch for ticket #19874 which has been marked ready for checkin.