test e7eb259f-7b20-44ce-b500-e826783f10b4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue