test e6a46883-6430-4979-8335-263280990ac4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault