test 2996fc01-38b7-4698-87e1-7d8bd94e226b (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault