test cba4d69a-6523-45e1-8731-a2d1c07aad5b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue