test cacb735b-49ac-41f5-80c4-2cf54259d5b7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue