Merge "TIF: Minor code improvement" into mnc-dev