test 2174f316-fa71-4568-8ba6-6ca8326559b6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault