Merge "Grant 'editcontentmodel' permission to 'user' group"