Followup from Rec!3375 (improve invalid value handling for tistos)
For details see Rec!3337 (merged)
To be tested with: Rec!3337 (merged) and Analysis!971 (merged)
For details see Rec!3337 (merged)
To be tested with: Rec!3337 (merged) and Analysis!971 (merged)