Fix for custom field delete
Merge branch 'user' into i18n