Fix fmt:off
with trailing child comment
#8234
+87
−7
Merged