Merge "Fix using separated buffers for each tile." into main