test 694bf261-0648-40b5-84d1-a73d6d010709 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault