test 61f652e8-f5ae-4241-8a08-925f70c33a0c (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault