Merge "Naming custom additional fields and filesys fields"