test 8ceac941-72d5-4656-9ec5-5936905187f5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault