test 159c1ded-2820-459a-995e-b0ab3c723a81 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault