case 3230 - Recostructing query to handle single and double quotes.
Merge branch 'case-3230' into develop