Cleanups to implementation of create()
#3111
Merged
Loading
8000
create()
#3111