Apply bug work around to DRT F5s and all GTMs

CHG0073352 Apply bug work around to DRT F5s and all GTMs