test 1620401e-7643-4374-860f-5c6985363894 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault