Fix T8129 (#8129)