test 6679d231-d1b2-4147-8608-fa5f69d990f1 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault