fixes #2670 - fix apostrophe quoting issue
(cherry picked from commit 4298bd841c3fb2b3f639f06d4cbbb3901f56ec06)