test e66b0e31-126c-46e7-9226-2e3daeb0a645 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault