test de0cf938-fd31-4d6c-baa4-29186427958a (rebased onto develop)



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

----

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