Stack 25 - apply IT fix

Cherry picked from develop

If the build keeps failing on IT501 or IT055, then pull this in.