Merge "Fix race condition in TileSpecRepository" into main