test 2a14a65b-33f9-426d-bc01-99914d8ad065 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault