Merging part-editing in dev