test 95d70642-bf74-4cd7-8994-521d1fac315d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault