test 0c934f96-ace3-461e-961e-4633afe2b5c1 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault