test 982e4cd1-8eae-45f7-ae09-b5bd631dd6f4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault