Merge "Add a few additional baseline entries" into main