Merge lod-master