test d76aeac9-8770-4962-9d1a-a569834cf39e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault