Fixes #16339 - Adds in string extraction and a couple of cleanups
View revisions
Also available in: Atom