test 617b3521-d62e-4269-9656-2569218a12a5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by gration.TestRebase.TestConflictingRebase.testPushRebaseContinue