test 697025c2-c3f6-4b17-b912-c449038fae27 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault