Merge "TIF: fix indexOfValue usage" into lmp-dev