Stack 25 - apply IT fix

Cherry picked from develop