Stringtablemerger Debugging
Manual merge of #1069