test b6c98926-7900-4b58-bfd6-581693e9cda6 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault