test d364afc6-74f6-4641-a537-b02b0e86b8e3 (rebased onto develop)



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

----

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