Merge branch 'jk/remote-literal-string-leakfix'