Merge "Update the database/sql owners" into main