test 8c511213-b435-44f6-8a41-d2024c899afb (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue