test 8d962ab9-5c80-4e3d-87ee-e58493cfffe6 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue