test ec0eefcb-0d10-425f-9fa8-bf689a1f2553 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue