test 25954a3e-38ee-42c1-a924-689d29fdff50 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault