#rb none
#jira FORT-256140, UE-89856
#ushell-cherrypick of 11894978 by Johan.Torp
#ROBOMERGE-SOURCE: CL 11894988 in //UE4/Release-4.25/... via CL 11894989
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)
[CL 11894990 by johan torp in Main branch]