Automatically added name field options
Merge branch 'dev' into ms