Fixes #2659 - Use gsub in a non-destructive manner(cherry picked from commit 92a8bdeff4503f0160ec2580996415e749ca0c8f)
Fixes #2659 - Use gsub in a non-destructive manner
(cherry picked from commit 92a8bdeff4503f0160ec2580996415e749ca0c8f)