test bf33830e-bf52-4796-934b-77bbf2db6936 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault