test 566d285e-5e75-4e04-af75-55a183e6475e (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault