Merge "resource edit component changes"