test df2d72c9-6d10-4bb3-9be9-1cdd03e9907b (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by gration.TestRebase.TestRebaseNewBranch.testDefault