Add two more field to embeduser
Merge branch 'master' into reordered-gc