Set uid during object create
Merge pull request #2333 from derekwaynecarr/validate_uid

Set uid during object create