test 47a5dd40-bca3-4b78-972b-f40bc04582b8 (rebased onto develop)



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

----

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