test a90d4c57-8d34-4eda-9f8b-b736e777269e (rebased onto develop)



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

----

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