Merge "Update the resources owners" into main