Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev