minor rebasing for tiled layers
merged