test cafaca9f-2938-4e5b-ad14-62cd5132db34 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue