test 501b38c4-ae17-4b07-ba5b-41d61b60160d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault