Merge "Make decode modules independent of tile index"