Remove single quote and change to escape double quote to avoid conflict with the string has a apostrophe
Merge branch 'MH-842' into dev