Stabilize quote-style preserve
#9922
+37
−33
Merged
preserve
#9922