Fixing single quote rendering issue
resolve merge conflict with public repo submission