test cf43ecf3-8242-4acc-ac53-1fea4758b210 (rebased onto develop)


This is the same as gh-7592 but rebased onto develop.

----

This is a call to Sandbox.open_pr by testDefault