test 973d2e54-6545-4797-9f65-e1026e08e5b2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault