Update T7594 as a result of fixing #8644