This change is a re-implementation of a previous fix for the same issue that was lost during the move from UE4->UE5
#preflight 619e28d3aa4521f9e7b6c0c2
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 18284269 via CL 18284297 via CL 18284301 via CL 18284323 via CL 18284325 via CL 18285442 via CL 18285467
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)
[CL 18285476 by graeme thornton in ue5-release-engine-test branch]