Merge "Update the Resources owners" into main