prefer single quote
Merge branch 'cs/#6660-prefer-single-quotes'

Close #6660