test 381f9e91-ec04-42f2-9281-1ae9ec9b1e7d (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault