test beb83020-d2bc-4cfc-bf9a-56a6443de563 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue