Merge "Split out edit/create methods from doEditContent()"