#85051 initial update for 5.x functions