test 01d688d9-b3c1-4429-82b9-29a1753c63e8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault