Some additional testdata I grabbed while writing up the draft of RFC 019. (cherry picked from commit d56392cee9)
d56392cee9
A manual backport of #8281, adjusted to stop at v0.35. * Update pending changelog. * Backport applicable fixes for v0.35 from master.