test 877c268b-dea4-4c00-be78-ebcc3c198aab (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue