Merge "Added missing code owners" into main