test 2cbd76b4-aed2-4280-8a97-908afe513d39 (rebased onto develop)



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

----

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