Merge branch 'refactor-udgen'