am 369e88b6: am b40933de: Merge "TIF: Convert fields to local variables" into mnc-dev

* commit '369e88b68d7cdd16ee0134d5fdf76c2893ef0a65':
  TIF: Convert fields to local variables