Merge pull request #120 from bkearney/bkearney/16339
Fixes #16339 - Adds in string extraction and a couple of cleanups
Merge pull request #120 from bkearney/bkearney/16339
Fixes #16339 - Adds in string extraction and a couple of cleanups