test dad6fc38-2c3f-4989-887f-fcdde4f95f5d (rebased onto develop)



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

----

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