main
Overhaul comment attachment (#13521)
Revert "Do not record trailing comma ..." (c3f03f6) (#15901)