test 3a0cfd72-f661-43a6-bc21-e685fc1cfff5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault