Merge branch 'nativeuid'