Forward port of issue #36091 to 3.2.x.

Comment From: wilkinsona

This isn't needed as the tests already exist in the main branch.