Merge "Resource edit changes"