Re rolling #2809 agaisnt 3.5

#2809

@rbran100 tagging for notification.