Followup from Rec!3337 (improve invalid value handling for tistos)
For details see Rec!3337 (merged)
To be tested with: Rec!3337 (merged) and DaVinci!893 (merged)
Edited by Abhijit Mathad
For details see Rec!3337 (merged)
To be tested with: Rec!3337 (merged) and DaVinci!893 (merged)