Merge "Update baseline lint." into main