#jira UE-84624
#rb ben.marsh
#lockdown cristina.riveron
#ushell-cherrypick of 10112674 by Joakim.Lindqvist
#ROBOMERGE-SOURCE: CL 10307082 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v593-10286020)
[CL 10307084 by joakim lindqvist in Main branch]