test 705f8646-d1bb-4d29-9824-2610ed39bc0d (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue