Merge "resource-edit changes"