Cherry-picks for 2.066.1

- Merge pull request #2596 from MartinNowak/metastrings