Merge "Editor name fields" into lmp-mr1-dev