test aa8db440-d672-4d69-8bb2-60b1d3fe4676 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault