Fix quoting in to nuon and refactor quoting functions
#14180
Merged
to nuon and refactor quoting functions
#14180