test 54b437f9-7a80-45c8-89a9-d655caec1fc8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault