Merge "TIF: fix setSurface() logic" into lmp-mr1-dev