test 35f64dc3-ccb0-4fed-8ee6-a03601101bd6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault