Fixing single quote rendering issue
resolve merge conflict with public repo submission
merge changes
Merge pull request #2003 from cjgronlund/dp-cg

Resolve merge issues with public contributions