test 2afcbede-8f66-4e8e-841f-bcc110f8e612 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue