test 6001d50e-1f73-4775-8f8d-ec91f490534d (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault