Merge "Perform SQL comment scanning with a manual parser" into main