test f4e25084-13ec-4180-85b8-7b88e37249fb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault