test 2051613b-eab9-49cf-acdc-7ef4b7dd52c8 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault