Packages from the vendor tgc

tgc/edit-content
tgc/edit-content-fix