Merge uuid changes into main stream