am b7e654fa: Merge "Editor name fields" into lmp-mr1-dev

* commit 'b7e654fae3cf0bd05605b0f5dd28d82f99e6d8fe':
  Editor name fields