Merge "Remove -pedantic" into main