test c4494d7e-bf8e-4d07-a182-1e6889b1c404 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue