Merge "Address leftover comments" into main