Merged latest MBTiles improvements