test 91340f9f-2161-4e98-bf75-05a9c0d80165 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue