test c3aeb102-86ae-4f4e-a031-9abae4142c9a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault